From: Aaron M. Ucko Date: Sun, 28 Sep 2025 00:58:00 +0000 (-0400) Subject: debian/patches: Update for new release, mostly formally. X-Git-Tag: archive/raspbian/2.17.0+ds-6+rpi1^2~37 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=81bb56c0d709fd571c9b99958b6651fed5a13dcd;p=ncbi-blast%2B.git debian/patches: Update for new release, mostly formally. * debian/patches/series: Comment out support_mbedtls3, allow_pcre2, and fix_bm_for_gcc15, all incorporated upstream. * debian/patches/system_mbedtls_only: Drop code changes (incorporated upstream) and port Makefile.connssl.lib's changes. --- diff --git a/debian/changelog b/debian/changelog index f2764668..e3f0729b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,13 @@ ncbi-blast+ (2.17.0+ds-1) UNRELEASED; urgency=medium * New upstream release. (NOT RELEASED YET.) + * debian/patches: Update for new release, mostly formally. + * debian/patches/series: Comment out support_mbedtls3, allow_pcre2, + and fix_bm_for_gcc15, all incorporated upstream. + * debian/patches/system_mbedtls_only: Drop code changes (incorporated + upstream) and port Makefile.connssl.lib's changes. - -- Aaron M. Ucko Sat, 27 Sep 2025 20:39:52 -0400 + -- Aaron M. Ucko Sat, 27 Sep 2025 20:57:59 -0400 ncbi-blast+ (2.16.0+ds-7) unstable; urgency=medium diff --git a/debian/patches/big_endian_workaround b/debian/patches/big_endian_workaround index 452d4052..2fba884b 100644 --- a/debian/patches/big_endian_workaround +++ b/debian/patches/big_endian_workaround @@ -1,6 +1,6 @@ --- a/c++/src/app/blastdb/makeblastdb.cpp +++ b/c++/src/app/blastdb/makeblastdb.cpp -@@ -293,7 +293,13 @@ void CMakeBlastDBApp::Init() +@@ -298,7 +298,13 @@ void CMakeBlastDBApp::Init() arg_desc->AddDefaultKey("blastdb_version", "version", "Version of BLAST database to be created", CArgDescriptions::eInteger, @@ -17,7 +17,7 @@ arg_desc->AddDefaultKey("max_file_sz", "number_of_bytes", --- a/c++/src/app/blastdb/makeprofiledb.cpp +++ b/c++/src/app/blastdb/makeprofiledb.cpp -@@ -420,7 +420,13 @@ void CMakeProfileDBApp::x_SetupArgDescri +@@ -418,7 +418,13 @@ void CMakeProfileDBApp::x_SetupArgDescri arg_desc->AddDefaultKey("blastdb_version", "version", "Version of BLAST database to be created", CArgDescriptions::eInteger, diff --git a/debian/patches/fix_lib_deps b/debian/patches/fix_lib_deps index bcdf0fa2..c88ac43c 100644 --- a/debian/patches/fix_lib_deps +++ b/debian/patches/fix_lib_deps @@ -30,7 +30,7 @@ Last-Update: 2016-12-05 +++ b/c++/src/algo/blast/core/Makefile.blast.lib @@ -23,6 +23,7 @@ CFLAGS = $(FAST_CFLAGS) LDFLAGS = $(FAST_LDFLAGS) - WATCHERS = madden camacho fongah2 + WATCHERS = camacho fongah2 +DLL_LIB = composition_adjustment xconnect tables @@ -93,7 +93,7 @@ Last-Update: 2016-12-05 seqmasks_io --- a/c++/src/build-system/library_relations.txt +++ b/c++/src/build-system/library_relations.txt -@@ -1369,7 +1369,7 @@ xassembly_svc needs gc_asn_access +@@ -1481,7 +1481,7 @@ xassembly_svc needs gc_asn_access xbiosample_util needs $(OBJEDIT_LIBS) xbiosample_util needs xmlwrapp xbiosample_util needs xobjutil @@ -128,7 +128,7 @@ Last-Update: 2016-12-05 +++ b/c++/src/corelib/Makefile.test_mt.lib @@ -3,6 +3,8 @@ SRC = test_mt - LIB = test_mt + LIB = test_mt +DLL_LIB = xncbi + @@ -274,7 +274,7 @@ Last-Update: 2016-12-05 LIBS = $(BLAST_THIRD_PARTY_LIBS) $(ORIG_LIBS) +DLL_LIB = xalnmgr ncbi_xloader_genbank seqdb blast_services xobjread xobjutil \ -+ xobjmgr xnetblast blastdb gene_info taxon1 seqset seq general xser \ ++ xobjmgr xnetblast blastdb taxon1 seqset seq general xser \ + xcgi xhtml tables xncbi + ### EXAMPLES OF OTHER SETTINGS THAT MIGHT BE OF INTEREST @@ -361,7 +361,7 @@ Last-Update: 2016-12-05 WATCHERS = camacho --- a/c++/src/objtools/data_loaders/genbank/Makefile.ncbi_xloader_genbank.lib +++ b/c++/src/objtools/data_loaders/genbank/Makefile.ncbi_xloader_genbank.lib -@@ -12,6 +12,10 @@ LIB_OR_DLL = both +@@ -13,6 +13,10 @@ LIB_OR_DLL = both # Dependencies for shared library DLL_LIB = general ncbi_xreader$(DLL) $(GENBANK_PSG_CLIENT_LDEP) @@ -469,8 +469,8 @@ Last-Update: 2016-12-05 CPPFLAGS = $(ORIG_CPPFLAGS) $(CMPRS_INCLUDE) --DLL_LIB = $(BZ2_LIB) $(LZO_LIB) $(Z_LIB) $(ZSTD_LIB) -+DLL_LIB = $(BZ2_LIB) $(LZO_LIB) $(Z_LIB) $(ZSTD_LIB) xutil xncbi +-DLL_LIB = $(BZ2_LIB) $(LZO_LIB) $(Z_LIB) $(ZSTD_LIB) zcf ++DLL_LIB = $(BZ2_LIB) $(LZO_LIB) $(Z_LIB) $(ZSTD_LIB) zcf xutil xncbi LIBS = $(BZ2_LIBS) $(LZO_LIBS) $(Z_LIBS) $(ZSTD_LIBS) $(ORIG_LIBS) WATCHERS = ivanov @@ -580,16 +580,6 @@ Last-Update: 2016-12-05 USES_LIBRARIES = \ xser ---- a/c++/src/objtools/blast/gene_info_reader/Makefile.gene_info.lib -+++ b/c++/src/objtools/blast/gene_info_reader/Makefile.gene_info.lib -@@ -6,6 +6,7 @@ CPPFLAGS = -DNCBI_MODULE=GENEINFO $(ORIG - LIB = gene_info - SRC = gene_info gene_info_reader file_utils - -+DLL_LIB = xncbi - - USES_LIBRARIES = \ - xncbi --- a/c++/src/objects/medlars/Makefile.medlars.lib +++ b/c++/src/objects/medlars/Makefile.medlars.lib @@ -1,6 +1,7 @@ @@ -600,27 +590,6 @@ Last-Update: 2016-12-05 USES_LIBRARIES = \ biblio ---- a/c++/src/objects/mla/Makefile.mla.lib -+++ b/c++/src/objects/mla/Makefile.mla.lib -@@ -1,7 +1,7 @@ - LIB = mla - SRC = mla__ mla___ - --DLL_LIB = medlars -+DLL_LIB = medlars pub pubmed xser xutil xncbi - - USES_LIBRARIES = \ - medlars pub pubmed ---- a/c++/src/objects/mla/Makefile.mlacli.lib -+++ b/c++/src/objects/mla/Makefile.mlacli.lib -@@ -5,5 +5,7 @@ SRC = mla_client mla_client_ - - DLL_LIB = mla pubmed medlars xconnect - -+DLL_LIB = mla xconnect xser xutil xncbi -+ - USES_LIBRARIES = \ - mla xconnect --- a/c++/src/objects/pubmed/Makefile.pubmed.lib +++ b/c++/src/objects/pubmed/Makefile.pubmed.lib @@ -1,6 +1,7 @@ @@ -685,7 +654,7 @@ Last-Update: 2016-12-05 +++ b/c++/src/algo/blast/format/Makefile.xblastformat.lib @@ -13,6 +13,8 @@ LIBS = $(BLAST_THIRD_PARTY_LIBS) $(ORIG_ - WATCHERS = jianye zaretska madden camacho fongah2 + WATCHERS = jianye zaretska camacho fongah2 +DLL_LIB = xformat $(BLAST_LIBS) align_format blastxml blastxml2 \ + xhtml xcgi xncbi @@ -709,7 +678,7 @@ Last-Update: 2016-12-05 WATCHERS = dicuccio gotvyans -+DLL_LIB = xcleanup valid gbseq mlacli mla medlars pubmed submit xalnmgr \ ++DLL_LIB = xcleanup valid gbseq medlars pubmed submit xalnmgr \ + xobjutil taxon3 $(SOBJMGR_LIBS) USES_LIBRARIES = \ diff --git a/debian/patches/hurd_fixes b/debian/patches/hurd_fixes index 884c030e..fd8f59e1 100644 --- a/debian/patches/hurd_fixes +++ b/debian/patches/hurd_fixes @@ -9,7 +9,7 @@ Author: Aaron M. Ucko Last-Update: 2020-09-19 --- a/c++/src/build-system/configure +++ b/c++/src/build-system/configure -@@ -10806,7 +10806,7 @@ if test -z "$CONF_f_runpath" ; then +@@ -10946,7 +10946,7 @@ if test -z "$CONF_f_runpath" ; then CONF_f_runpath="-R" ;; linux*:[GI]CC | linux*Clang | *bsd*:GCC | *bsd*Clang | cygwin*:GCC \ @@ -20,7 +20,7 @@ Last-Update: 2020-09-19 irix*:* | linux*:KCC | *:Compaq ) --- a/c++/src/build-system/configure.ac +++ b/c++/src/build-system/configure.ac -@@ -2424,7 +2424,7 @@ if test -z "$CONF_f_runpath" ; then +@@ -2470,7 +2470,7 @@ if test -z "$CONF_f_runpath" ; then CONF_f_runpath="-R" ;; linux*:[[GI]]CC | linux*Clang | *bsd*:GCC | *bsd*Clang | cygwin*:GCC \ @@ -42,7 +42,7 @@ Last-Update: 2020-09-19 --- a/c++/src/connect/ncbi_localip.c +++ b/c++/src/connect/ncbi_localip.c -@@ -67,7 +67,7 @@ +@@ -68,7 +68,7 @@ # define INADDR_LOOPBACK 0x7F000001 #endif /*!INADDR_LOOPBACK*/ diff --git a/debian/patches/no_multiarch_rpath b/debian/patches/no_multiarch_rpath index 8423cd88..8f554a8e 100644 --- a/debian/patches/no_multiarch_rpath +++ b/debian/patches/no_multiarch_rpath @@ -10,7 +10,7 @@ Author: Aaron M. Ucko Last-Update: 2011-08-28 --- a/c++/src/build-system/configure +++ b/c++/src/build-system/configure -@@ -10912,7 +10912,7 @@ case "$compiler:$compiler_version:$with_ +@@ -11052,7 +11052,7 @@ case "$compiler:$compiler_version:$with_ break ;; /* ) @@ -21,7 +21,7 @@ Last-Update: 2011-08-28 esac --- a/c++/src/build-system/configure.ac +++ b/c++/src/build-system/configure.ac -@@ -2491,7 +2491,7 @@ case "$compiler:$compiler_version:$with_ +@@ -2537,7 +2537,7 @@ case "$compiler:$compiler_version:$with_ break ;; /* ) diff --git a/debian/patches/optin_usage_report b/debian/patches/optin_usage_report index 8a73c3f8..4e27b883 100644 --- a/debian/patches/optin_usage_report +++ b/debian/patches/optin_usage_report @@ -7,7 +7,7 @@ Last-Updated: 202-02-10 Forwarded: no --- a/c++/src/algo/blast/api/blast_usage_report.cpp +++ b/c++/src/algo/blast/api/blast_usage_report.cpp -@@ -190,6 +190,7 @@ void CBlastUsageReport::AddParam(EUsageP +@@ -195,6 +195,7 @@ void CBlastUsageReport::AddParam(EUsageP void CBlastUsageReport::x_CheckBlastUsageEnv() { char * blast_usage_env = getenv("BLAST_USAGE_REPORT"); @@ -15,7 +15,7 @@ Forwarded: no if(blast_usage_env != NULL){ bool enable = NStr::StringToBool(blast_usage_env); if (!enable) { -@@ -198,6 +199,10 @@ void CBlastUsageReport::x_CheckBlastUsag +@@ -203,6 +204,10 @@ void CBlastUsageReport::x_CheckBlastUsag LOG_POST(Info <<"Phone home disabled"); return ; } @@ -26,7 +26,7 @@ Forwarded: no } CNcbiIstrstream empty_stream(kEmptyStr); -@@ -210,10 +215,15 @@ void CBlastUsageReport::x_CheckBlastUsag +@@ -215,10 +220,15 @@ void CBlastUsageReport::x_CheckBlastUsag LOG_POST(Info <<"Phone home disabled by config setting"); return ; } diff --git a/debian/patches/run_perl_directly b/debian/patches/run_perl_directly index af73bca1..ce285c9e 100644 --- a/debian/patches/run_perl_directly +++ b/debian/patches/run_perl_directly @@ -7,6 +7,6 @@ Description: Bypass env in Perl script shebangs. @@ -1,4 +1,4 @@ -#!/usr/bin/env perl +#!/usr/bin/perl - # $Id: update_blastdb.pl 681901 2024-04-17 13:16:37Z ivanov $ + # $Id: update_blastdb.pl 697487 2025-05-14 13:03:33Z ivanov $ # =========================================================================== # diff --git a/debian/patches/series b/debian/patches/series index a1c9c0e9..5c34fb88 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,6 +1,6 @@ system_mbedtls_only -support_mbedtls3 -allow_pcre2 +# support_mbedtls3 +# allow_pcre2 optin_usage_report enable_clean_after_failed_compile hurd_fixes @@ -21,4 +21,4 @@ run_perl_directly tune_lmdb_defaults 2to3 big_endian_workaround -fix_bm_for_gcc15 +# fix_bm_for_gcc15 diff --git a/debian/patches/skip_services_unit_test b/debian/patches/skip_services_unit_test index 309f9443..5ebb74a2 100644 --- a/debian/patches/skip_services_unit_test +++ b/debian/patches/skip_services_unit_test @@ -13,4 +13,4 @@ Last-Updated: 2013-06-01 +# This test requires an internet connection, shouldn't be run on a build server +# CHECK_CMD = blast_services_unit_test - WATCHERS = madden camacho + WATCHERS = camacho diff --git a/debian/patches/spelling b/debian/patches/spelling index c5335527..cd930c62 100644 --- a/debian/patches/spelling +++ b/debian/patches/spelling @@ -44,7 +44,7 @@ Subject: Spelling fixes SetupArgDescriptions(arg_desc.release()); --- a/c++/src/app/blastdb/makeprofiledb.cpp +++ b/c++/src/app/blastdb/makeprofiledb.cpp -@@ -1838,7 +1838,7 @@ bool CMakeProfileDBApp::x_CheckDelta( co +@@ -1811,7 +1811,7 @@ bool CMakeProfileDBApp::x_CheckDelta( co if( !x_ValidateCd(freqs, obsr, BLASTAA_SIZE) && m_ExcludeInvalid) { *m_LogFile << filename + @@ -55,7 +55,7 @@ Subject: Spelling fixes return true; --- a/c++/src/objects/seqalign/Dense_seg.cpp +++ b/c++/src/objects/seqalign/Dense_seg.cpp -@@ -980,7 +980,7 @@ void CDense_seg::RemapToLoc(TDim row, co +@@ -1001,7 +1001,7 @@ void CDense_seg::RemapToLoc(TDim row, co if (loc_plus != (seq_loc_i.GetStrand() != eNa_strand_minus)) { NCBI_THROW(CSeqalignException, eInvalidInputData, "CDense_seg::RemapToLoc():" @@ -77,7 +77,7 @@ Subject: Spelling fixes if (widths_determined[seg]) { --- a/c++/src/objects/seqfeat/institution_codes.inc +++ b/c++/src/objects/seqfeat/institution_codes.inc -@@ -791,7 +791,7 @@ static const char* const kInstitutionCol +@@ -832,7 +832,7 @@ static const char* const kInstitutionCol "BPPT-ESC\tc\tBPPT Ethanol-Single Cell Protein-Fructose Syrup Technical Unit\t\t\t", "BPU\ts\tEoetvoes Lorand University, Department of Plant Taxonomy and Ecology\t\t\t", "BR\ts\tBotanic Garden Meise\t\t\t", @@ -88,7 +88,7 @@ Subject: Spelling fixes "BRB\ts\tBrassica Resource Bank\t\t\t", --- a/c++/src/objects/seqfeat/institution_codes.txt +++ b/c++/src/objects/seqfeat/institution_codes.txt -@@ -755,7 +755,7 @@ BPM s Beipiao Paleontological Museum +@@ -796,7 +796,7 @@ BPM s Beipiao Paleontological Museum BPPT-ESC c BPPT Ethanol-Single Cell Protein-Fructose Syrup Technical Unit BPU s Eoetvoes Lorand University, Department of Plant Taxonomy and Ecology BR s Botanic Garden Meise @@ -110,7 +110,7 @@ Subject: Spelling fixes NCBI_THROW_FMT(CObjMgrException, eFindConflict, --- a/c++/src/objtools/align_format/taxFormat.cpp +++ b/c++/src/objtools/align_format/taxFormat.cpp -@@ -616,7 +616,7 @@ void CTaxFormat::x_LoadTaxTree(void) +@@ -689,7 +689,7 @@ void CTaxFormat::x_LoadTaxTree(void) } } if (!tax_load_ok) { @@ -121,7 +121,7 @@ Subject: Spelling fixes --- a/c++/src/objtools/format/flat_file_config.cpp +++ b/c++/src/objtools/format/flat_file_config.cpp -@@ -655,7 +655,7 @@ void CFlatFileConfig::AddArgumentDescrip +@@ -656,7 +656,7 @@ void CFlatFileConfig::AddArgumentDescrip // from arg_desc->AddOptionalKey("from", "From", @@ -143,7 +143,7 @@ Subject: Spelling fixes out_sObjectClosingString = "} }" + out_sObjectClosingString; --- a/c++/src/objtools/readers/agp_util.cpp +++ b/c++/src/objtools/readers/agp_util.cpp -@@ -173,7 +173,7 @@ const CAgpErr::TStr CAgpErr::s_msg[]= { +@@ -174,7 +174,7 @@ const CAgpErr::TStr CAgpErr::s_msg[]= { "object_beg != previous object_end + 1", "no valid AGP lines", @@ -152,7 +152,7 @@ Subject: Spelling fixes "in \"Scaffold from component\" file, invalid scaffold-breaking gap", "in \"Chromosome from scaffold\" file, invalid \"within-scaffold\" gap", -@@ -193,7 +193,7 @@ const CAgpErr::TStr CAgpErr::s_msg[]= { +@@ -194,7 +194,7 @@ const CAgpErr::TStr CAgpErr::s_msg[]= { // Content Warnings "gap at the end of object (OK if X is the circular chromosome/plasmid)", "gap at the beginning of object ", diff --git a/debian/patches/suppress_tls_version_checks b/debian/patches/suppress_tls_version_checks index 6669ec04..eb1651fd 100644 --- a/debian/patches/suppress_tls_version_checks +++ b/debian/patches/suppress_tls_version_checks @@ -8,26 +8,26 @@ Description: suppress gnu TLS and mbed TLS version checks --- a/c++/src/connect/ncbi_gnutls.c +++ b/c++/src/connect/ncbi_gnutls.c -@@ -748,6 +748,7 @@ static EIO_Status s_GnuTlsInit(FSSLPull +@@ -769,6 +769,7 @@ static EIO_Status s_GnuTlsInit(FSSLPull - assert(!s_GnuTlsCredAnon); + CORE_TRACE("GnuTlsInit(): Enter"); +#if 0 version = gnutls_check_version(0); if (strcasecmp(GNUTLS_VERSION, version) != 0) { CORE_LOGF_X(26, eLOG_Critical, -@@ -755,6 +756,7 @@ static EIO_Status s_GnuTlsInit(FSSLPull +@@ -776,6 +777,7 @@ static EIO_Status s_GnuTlsInit(FSSLPull GNUTLS_VERSION, version)); assert(0); } +#endif - CORE_TRACE("GnuTlsInit(): Enter"); - + if (!pull || !push) { + status = eIO_InvalidArg; --- a/c++/src/connect/ncbi_mbedtls.c +++ b/c++/src/connect/ncbi_mbedtls.c -@@ -739,12 +739,14 @@ static EIO_Status s_MbedTlsInit(FSSLPull - psa_status_t psa_status; +@@ -770,12 +770,14 @@ static EIO_Status s_MbedTlsInit(FSSLPull + CORE_TRACE("MbedTlsInit(): Enter"); mbedtls_version_get_string(version); +#if 0 @@ -39,5 +39,5 @@ Description: suppress gnu TLS and mbed TLS version checks } +#endif - CORE_TRACE("MbedTlsInit(): Enter"); - + if (!pull || !push) { + status = eIO_InvalidArg; diff --git a/debian/patches/system_mbedtls_only b/debian/patches/system_mbedtls_only index 2f381dd5..45304215 100644 --- a/debian/patches/system_mbedtls_only +++ b/debian/patches/system_mbedtls_only @@ -3,65 +3,23 @@ Date: Wed, 01 Dec 2021 23:33:11 -0500 Subject: Omit convenience mbed TLS copy --- a/c++/src/connect/Makefile.connssl.lib +++ b/c++/src/connect/Makefile.connssl.lib -@@ -1,8 +1,10 @@ - # $Id: Makefile.connssl.lib 642488 2021-12-20 21:00:34Z ucko $ +@@ -1,6 +1,6 @@ + # $Id: Makefile.connssl.lib 682178 2024-04-23 19:31:32Z ucko $ -CPPFLAGS = $(TLS_INCLUDE) -I$(srcdir)/mbedtls $(ORIG_CPPFLAGS) +CPPFLAGS = $(TLS_INCLUDE) $(ORIG_CPPFLAGS) --SRC_TLS = ncbi_gnutls ncbi_mbedtls ncbi_tls \ -+SRC_TLS = ncbi_gnutls ncbi_mbedtls ncbi_tls -+ -+SRC_MBEDTLS_UNUSED = \ - mbedtls/aes mbedtls/aesni mbedtls/arc4 mbedtls/aria \ - mbedtls/asn1parse mbedtls/asn1write mbedtls/base64 mbedtls/bignum \ - mbedtls/blowfish mbedtls/camellia mbedtls/ccm mbedtls/chacha20 \ ---- a/c++/src/connect/connect_misc_impl.hpp -+++ b/c++/src/connect/connect_misc_impl.hpp -@@ -30,11 +30,10 @@ - * - */ - --#include "mbedtls/mbedtls/ncbicxx_rename_mbedtls.h" --#include "mbedtls/mbedtls/error.h" --#include "mbedtls/mbedtls/ctr_drbg.h" --#include "mbedtls/mbedtls/entropy.h" --#include "mbedtls/mbedtls/ssl.h" -+#include -+#include -+#include -+#include - - #include - ---- a/c++/src/connect/ncbi_mbedtls.c -+++ b/c++/src/connect/ncbi_mbedtls.c -@@ -43,7 +43,6 @@ - - #if defined(HAVE_LIBMBEDTLS) || defined(NCBI_CXX_TOOLKIT) - --# ifdef HAVE_LIBMBEDTLS /* external */ - # include - # include - # include -@@ -53,17 +52,6 @@ - # include - # include - # include --# else /* embedded */ --# include "mbedtls/mbedtls/ctr_drbg.h" --# include "mbedtls/mbedtls/debug.h" --# include "mbedtls/mbedtls/entropy.h" --# include "mbedtls/mbedtls/error.h" --# include "mbedtls/mbedtls/pk.h" --# include "mbedtls/mbedtls/net_sockets.h" --# include "mbedtls/mbedtls/ssl.h" --# include "mbedtls/mbedtls/threading.h" --# include "mbedtls/mbedtls/version.h" --# endif /*HAVE_LIBMBEDTLS*/ - - # if defined(ENOTSUP) - # define NCBI_NOTSUPPORTED ENOTSUP + SRC_MBED = aes aesce aesni aria asn1parse asn1write base64 bignum bignum_core \ + bignum_mod bignum_mod_raw block_cipher camellia ccm chacha20 \ +@@ -21,7 +21,7 @@ SRC_MBED = aes aesce aesni aria asn1pars + ssl_tls13_client ssl_tls13_generic ssl_tls13_keys ssl_tls13_server \ + threading timing version_features x509 x509_create x509_crl \ + x509_crt x509_csr x509write x509write_crt x509write_csr +-SRC_TLS = ncbi_gnutls ncbi_mbedtls ncbi_tls $(SRC_MBED:%=mbedtls/%) ++SRC_TLS = ncbi_gnutls ncbi_mbedtls ncbi_tls # $(SRC_MBED:%=mbedtls/%) + + SRC = $(SRC_TLS) + LIB = connssl --- a/c++/src/connect/Makefile.xxconnect2.lib +++ b/c++/src/connect/Makefile.xxconnect2.lib @@ -9,8 +9,7 @@ REQUIRES = LIBUV NGHTTP2